From c2da2f7ecd52a60bf7ba97f0ceb64b38ea75ae0d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 3 Jul 2020 09:53:27 -0400 Subject: [PATCH] selectionfilter: Fix bugs in signal translation When the position is 0, we can't check for unchanged elements below with gtk_bitset_size_in_range. And we don't need to, either. And be careful when translating [start,length] intervals to [first,last] ones. Off-by-one errors lurk everywhere. --- gtk/gtkselectionfiltermodel.c | 61 +++++++++++++++++------------------ 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/gtk/gtkselectionfiltermodel.c b/gtk/gtkselectionfiltermodel.c index 5cf094e1a3..68e055329a 100644 --- a/gtk/gtkselectionfiltermodel.c +++ b/gtk/gtkselectionfiltermodel.c @@ -100,22 +100,26 @@ G_DEFINE_TYPE_WITH_CODE (GtkSelectionFilterModel, gtk_selection_filter_model, G_ G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, gtk_selection_filter_model_list_model_init)) static void -gtk_selection_filter_model_items_changed_cb (GListModel *model, - guint position, - guint removed, - guint added, - GtkSelectionFilterModel *self) +selection_filter_model_items_changed (GtkSelectionFilterModel *self, + guint position, + guint removed, + guint added) { GtkBitset *selection; - guint sel_position; - guint sel_removed; - guint sel_added; + guint sel_position = 0; + guint sel_removed = 0; + guint sel_added = 0; selection = gtk_selection_model_get_selection (self->model); - sel_position = gtk_bitset_get_size_in_range (self->selection, 0, position - 1); - sel_removed = gtk_bitset_get_size_in_range (self->selection, position, position + removed); - sel_added = gtk_bitset_get_size_in_range (selection, position, position + added); + if (position > 0) + sel_position = gtk_bitset_get_size_in_range (self->selection, 0, position - 1); + + if (removed > 0) + sel_removed = gtk_bitset_get_size_in_range (self->selection, position, position + removed - 1); + + if (added > 0) + sel_added = gtk_bitset_get_size_in_range (selection, position, position + added - 1); gtk_bitset_unref (self->selection); self->selection = gtk_bitset_copy (selection); @@ -127,29 +131,22 @@ gtk_selection_filter_model_items_changed_cb (GListModel *model, } static void -gtk_selection_filter_model_selection_changed_cb (GListModel *model, - guint position, - guint n_items, - GtkSelectionFilterModel *self) +gtk_selection_filter_model_items_changed_cb (GListModel *model, + guint position, + guint removed, + guint added, + GtkSelectionFilterModel *self) { - GtkBitset *selection; - guint sel_position; - guint sel_removed; - guint sel_added; - - selection = gtk_selection_model_get_selection (self->model); - - sel_position = gtk_bitset_get_size_in_range (self->selection, 0, position - 1); - sel_removed = gtk_bitset_get_size_in_range (self->selection, position, position + n_items); - sel_added = gtk_bitset_get_size_in_range (selection, position, position + n_items); - - gtk_bitset_unref (self->selection); - self->selection = gtk_bitset_copy (selection); - - gtk_bitset_unref (selection); + selection_filter_model_items_changed (self, position, removed, added); +} - if (sel_removed > 0 || sel_added > 0) - g_list_model_items_changed (G_LIST_MODEL (self), sel_position, sel_removed, sel_added); +static void +gtk_selection_filter_model_selection_changed_cb (GListModel *model, + guint position, + guint n_items, + GtkSelectionFilterModel *self) +{ + selection_filter_model_items_changed (self, position, n_items, n_items); } static void -- 2.30.2